+Sat Nov 8 23:06:02 2003 Matthias Clasen <maclas@gmx.de>
+
+ * demos/gtk-demo/main.c (row_activated_cb): Call the do_
+ functions with the toplevel as argument.
+
+ * demos/gtk-demo/geninclude.pl.in: Change the signature
+ of GDoDemoFunc to take a widget argument
+
+ * demos/gtk-demo/ui_manager.c (do_ui_manager):
+ * demos/gtk-demo/tree_store.c (do_tree_store):
+ * demos/gtk-demo/textview.c (do_textview):
+ * demos/gtk-demo/stock_browser.c (do_stock_browser):
+ * demos/gtk-demo/sizegroup.c (do_sizegroup):
+ * demos/gtk-demo/pixbufs.c (do_pixbufs):
+ * demos/gtk-demo/panes.c (do_panes):
+ * demos/gtk-demo/menus.c (do_menus):
+ * demos/gtk-demo/list_store.c (do_list_store):
+ * demos/gtk-demo/images.c (do_images):
+ * demos/gtk-demo/hypertext.c (do_hypertext):
+ * demos/gtk-demo/editable_cells.c (do_editable_cells):
+ * demos/gtk-demo/drawingarea.c (do_drawingarea):
+ * demos/gtk-demo/dialog.c (do_dialog):
+ * demos/gtk-demo/colorsel.c (do_colorsel):
+ * demos/gtk-demo/changedisplay.c (do_changedisplay):
+ * demos/gtk-demo/button_box.c (do_button_box):
+ * demos/gtk-demo/appwindow.c (do_appwindow): Take a widget
+ as argument, and make new windows or dialogs appear on the
+ same screen. (#80388)
+
Sat Nov 8 21:59:30 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkeventbox.c (gtk_event_box_class_init): Let
+Sat Nov 8 23:06:02 2003 Matthias Clasen <maclas@gmx.de>
+
+ * demos/gtk-demo/main.c (row_activated_cb): Call the do_
+ functions with the toplevel as argument.
+
+ * demos/gtk-demo/geninclude.pl.in: Change the signature
+ of GDoDemoFunc to take a widget argument
+
+ * demos/gtk-demo/ui_manager.c (do_ui_manager):
+ * demos/gtk-demo/tree_store.c (do_tree_store):
+ * demos/gtk-demo/textview.c (do_textview):
+ * demos/gtk-demo/stock_browser.c (do_stock_browser):
+ * demos/gtk-demo/sizegroup.c (do_sizegroup):
+ * demos/gtk-demo/pixbufs.c (do_pixbufs):
+ * demos/gtk-demo/panes.c (do_panes):
+ * demos/gtk-demo/menus.c (do_menus):
+ * demos/gtk-demo/list_store.c (do_list_store):
+ * demos/gtk-demo/images.c (do_images):
+ * demos/gtk-demo/hypertext.c (do_hypertext):
+ * demos/gtk-demo/editable_cells.c (do_editable_cells):
+ * demos/gtk-demo/drawingarea.c (do_drawingarea):
+ * demos/gtk-demo/dialog.c (do_dialog):
+ * demos/gtk-demo/colorsel.c (do_colorsel):
+ * demos/gtk-demo/changedisplay.c (do_changedisplay):
+ * demos/gtk-demo/button_box.c (do_button_box):
+ * demos/gtk-demo/appwindow.c (do_appwindow): Take a widget
+ as argument, and make new windows or dialogs appear on the
+ same screen. (#80388)
+
Sat Nov 8 21:59:30 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkeventbox.c (gtk_event_box_class_init): Let
+Sat Nov 8 23:06:02 2003 Matthias Clasen <maclas@gmx.de>
+
+ * demos/gtk-demo/main.c (row_activated_cb): Call the do_
+ functions with the toplevel as argument.
+
+ * demos/gtk-demo/geninclude.pl.in: Change the signature
+ of GDoDemoFunc to take a widget argument
+
+ * demos/gtk-demo/ui_manager.c (do_ui_manager):
+ * demos/gtk-demo/tree_store.c (do_tree_store):
+ * demos/gtk-demo/textview.c (do_textview):
+ * demos/gtk-demo/stock_browser.c (do_stock_browser):
+ * demos/gtk-demo/sizegroup.c (do_sizegroup):
+ * demos/gtk-demo/pixbufs.c (do_pixbufs):
+ * demos/gtk-demo/panes.c (do_panes):
+ * demos/gtk-demo/menus.c (do_menus):
+ * demos/gtk-demo/list_store.c (do_list_store):
+ * demos/gtk-demo/images.c (do_images):
+ * demos/gtk-demo/hypertext.c (do_hypertext):
+ * demos/gtk-demo/editable_cells.c (do_editable_cells):
+ * demos/gtk-demo/drawingarea.c (do_drawingarea):
+ * demos/gtk-demo/dialog.c (do_dialog):
+ * demos/gtk-demo/colorsel.c (do_colorsel):
+ * demos/gtk-demo/changedisplay.c (do_changedisplay):
+ * demos/gtk-demo/button_box.c (do_button_box):
+ * demos/gtk-demo/appwindow.c (do_appwindow): Take a widget
+ as argument, and make new windows or dialogs appear on the
+ same screen. (#80388)
+
Sat Nov 8 21:59:30 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkeventbox.c (gtk_event_box_class_init): Let
+Sat Nov 8 23:06:02 2003 Matthias Clasen <maclas@gmx.de>
+
+ * demos/gtk-demo/main.c (row_activated_cb): Call the do_
+ functions with the toplevel as argument.
+
+ * demos/gtk-demo/geninclude.pl.in: Change the signature
+ of GDoDemoFunc to take a widget argument
+
+ * demos/gtk-demo/ui_manager.c (do_ui_manager):
+ * demos/gtk-demo/tree_store.c (do_tree_store):
+ * demos/gtk-demo/textview.c (do_textview):
+ * demos/gtk-demo/stock_browser.c (do_stock_browser):
+ * demos/gtk-demo/sizegroup.c (do_sizegroup):
+ * demos/gtk-demo/pixbufs.c (do_pixbufs):
+ * demos/gtk-demo/panes.c (do_panes):
+ * demos/gtk-demo/menus.c (do_menus):
+ * demos/gtk-demo/list_store.c (do_list_store):
+ * demos/gtk-demo/images.c (do_images):
+ * demos/gtk-demo/hypertext.c (do_hypertext):
+ * demos/gtk-demo/editable_cells.c (do_editable_cells):
+ * demos/gtk-demo/drawingarea.c (do_drawingarea):
+ * demos/gtk-demo/dialog.c (do_dialog):
+ * demos/gtk-demo/colorsel.c (do_colorsel):
+ * demos/gtk-demo/changedisplay.c (do_changedisplay):
+ * demos/gtk-demo/button_box.c (do_button_box):
+ * demos/gtk-demo/appwindow.c (do_appwindow): Take a widget
+ as argument, and make new windows or dialogs appear on the
+ same screen. (#80388)
+
Sat Nov 8 21:59:30 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkeventbox.c (gtk_event_box_class_init): Let
+Sat Nov 8 23:06:02 2003 Matthias Clasen <maclas@gmx.de>
+
+ * demos/gtk-demo/main.c (row_activated_cb): Call the do_
+ functions with the toplevel as argument.
+
+ * demos/gtk-demo/geninclude.pl.in: Change the signature
+ of GDoDemoFunc to take a widget argument
+
+ * demos/gtk-demo/ui_manager.c (do_ui_manager):
+ * demos/gtk-demo/tree_store.c (do_tree_store):
+ * demos/gtk-demo/textview.c (do_textview):
+ * demos/gtk-demo/stock_browser.c (do_stock_browser):
+ * demos/gtk-demo/sizegroup.c (do_sizegroup):
+ * demos/gtk-demo/pixbufs.c (do_pixbufs):
+ * demos/gtk-demo/panes.c (do_panes):
+ * demos/gtk-demo/menus.c (do_menus):
+ * demos/gtk-demo/list_store.c (do_list_store):
+ * demos/gtk-demo/images.c (do_images):
+ * demos/gtk-demo/hypertext.c (do_hypertext):
+ * demos/gtk-demo/editable_cells.c (do_editable_cells):
+ * demos/gtk-demo/drawingarea.c (do_drawingarea):
+ * demos/gtk-demo/dialog.c (do_dialog):
+ * demos/gtk-demo/colorsel.c (do_colorsel):
+ * demos/gtk-demo/changedisplay.c (do_changedisplay):
+ * demos/gtk-demo/button_box.c (do_button_box):
+ * demos/gtk-demo/appwindow.c (do_appwindow): Take a widget
+ as argument, and make new windows or dialogs appear on the
+ same screen. (#80388)
+
Sat Nov 8 21:59:30 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkeventbox.c (gtk_event_box_class_init): Let
GtkWidget *
-do_appwindow (void)
+do_appwindow (GtkWidget *do_widget)
{
if (!window)
{
*/
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Application Window");
/* NULL window variable when window is closed */
}
GtkWidget *
-do_button_box (void)
+do_button_box (GtkWidget *do_widget)
{
static GtkWidget *window = NULL;
GtkWidget *main_vbox;
if (!window)
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
g_signal_connect (window, "destroy",
* it. Otherwise, destroys it.
*/
GtkWidget *
-do_changedisplay (void)
+do_changedisplay (GtkWidget *do_widget)
{
static ChangeDisplayInfo *info = NULL;
info = g_new0 (ChangeDisplayInfo, 1);
info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
- NULL, /* parent */
+ GTK_WINDOW (do_widget),
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
"Change", GTK_RESPONSE_OK,
}
GtkWidget *
-do_colorsel (void)
+do_colorsel (GtkWidget *do_widget)
{
GtkWidget *vbox;
GtkWidget *button;
color.green = 0;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
g_signal_connect (window, "destroy",
}
GtkWidget *
-do_dialog (void)
+do_dialog (GtkWidget *do_widget)
{
GtkWidget *frame;
GtkWidget *vbox;
if (!window)
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
}
GtkWidget *
-do_drawingarea (void)
+do_drawingarea (GtkWidget *do_widget)
{
GtkWidget *frame;
GtkWidget *vbox;
if (!window)
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
}
GtkWidget *
-do_editable_cells (void)
+do_editable_cells (GtkWidget *do_widget)
{
if (!window)
{
/* create window, etc */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
gtk_container_set_border_width (GTK_CONTAINER (window), 5);
g_signal_connect (window, "destroy",
#!@PERL@ -w
print <<EOT;
-typedef GtkWidget *(*GDoDemoFunc) (void);
+typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
typedef struct _Demo Demo;
close INFO_FILE;
- print "GtkWidget *do_$basename (void);\n";
+ print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
push @demos, {"title" => $title, "file" => $file,
"func" => "do_$basename"};
/* Text Widget/Hypertext
*
- * Usually, tags modify the appearance of text in the view, e.g. making it bold or colored or underlined.
- * But tags are not restricted to appearance. They can also affect the behavior of mouse and key presses,
- * as this demo shows.
+ * Usually, tags modify the appearance of text in the view, e.g. making it
+ * bold or colored or underlined. But tags are not restricted to appearance.
+ * They can also affect the behavior of mouse and key presses, as this demo
+ * shows.
*/
#include <gtk/gtk.h>
}
GtkWidget *
-do_hypertext (void)
+do_hypertext (GtkWidget *do_widget)
{
static GtkWidget *window = NULL;
regular_cursor = gdk_cursor_new (GDK_XTERM);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_default_size (GTK_WINDOW (window),
450, 450);
GtkWidget *
-do_images (void)
+do_images (GtkWidget *do_widget)
{
GtkWidget *frame;
GtkWidget *vbox;
if (!window)
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Images");
g_signal_connect (window, "destroy",
}
GtkWidget *
-do_list_store (void)
+do_list_store (GtkWidget *do_widget)
{
if (!window)
{
/* create window, etc */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
g_signal_connect (window, "destroy",
&iter,
ITALIC_COLUMN, !italic,
-1);
- window = (func) ();
+ window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
if (window != NULL)
{
}
GtkWidget *
-do_menus (void)
+do_menus (GtkWidget *do_widget)
{
static GtkWidget *window = NULL;
GtkWidget *box1;
GtkAccelGroup *accel_group;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
g_signal_connect (window, "destroy",
G_CALLBACK(gtk_widget_destroyed), &window);
g_signal_connect (window, "delete-event",
}
GtkWidget *
-do_panes (void)
+do_panes (GtkWidget *do_widget)
{
static GtkWidget *window = NULL;
GtkWidget *frame;
if (!window)
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
}
GtkWidget *
-do_pixbufs (void)
+do_pixbufs (GtkWidget *do_widget)
{
if (!window)
{
GError *error;
-
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
}
GtkWidget *
-do_sizegroup (void)
+do_sizegroup (GtkWidget *do_widget)
{
GtkWidget *table;
GtkWidget *frame;
if (!window)
{
window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
- NULL, 0,
+ GTK_WINDOW (do_widget),
+ 0,
GTK_STOCK_CLOSE,
GTK_RESPONSE_NONE,
NULL);
}
GtkWidget *
-do_stock_browser (void)
+do_stock_browser (GtkWidget *do_widget)
{
if (!window)
{
GtkTreeViewColumn *column;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Stock Icons and Items");
gtk_window_set_default_size (GTK_WINDOW (window), -1, 500);
}
GtkWidget *
-do_textview (void)
+do_textview (GtkWidget *do_widget)
{
static GtkWidget *window = NULL;
GtkTextBuffer *buffer;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_default_size (GTK_WINDOW (window),
450, 450);
}
GtkWidget *
-do_tree_store (void)
+do_tree_store (GtkWidget *do_widget)
{
if (!window)
{
/* create window, etc */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
"</ui>";
GtkWidget *
-do_ui_manager (void)
+do_ui_manager (GtkWidget *do_widget)
{
static GtkWidget *window = NULL;
GError *error = NULL;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (do_widget));
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);